projects / cargo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0590d30 da4b8af)
Auto merge of #2092 - gkoz:lock_line_endings, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 30 Oct 2015 19:39:46 +0000 (19:39 +0000)
committerbors <bors@rust-lang.org>
Fri, 30 Oct 2015 19:39:46 +0000 (19:39 +0000)
Before writing the lockfile read the existing one and

 * detect the line endings style, fixes #2076, #1722;
 * compare the contents to avoid redundant overwriting.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.